am: 64b44f81 -s ours Change-Id: Iabb144c2750571585d280d1bbc3459e0239beefc
mentioned in commit ca1d962b