am: 6f78f477 -s ours Change-Id: Ib47ed588e9af608d718e6517e820d5b149870967
mentioned in commit 8cbf6750