am: ba412c1d -s ours Change-Id: I621fb94a7406745b5bdeab39fe0079b9585777ba
mentioned in commit 678a1934