am: 785a3b55 -s ours Change-Id: Idd3089e7691b47c8133db8953f441723b7468b11
mentioned in commit 004bb6c5