am: d149d200 -s ours Change-Id: Icb899cdc587be94aa7af03b560af484206f51abf
mentioned in commit 0386e0bb