am: 4f272616 -s ours Change-Id: Iacb415866074c9e8c3ee97330917681a8b04e8b8
mentioned in commit b126cdf2