am: 11dcf643 -s ours Change-Id: I71cb0948d9b07a9abe3ab1fd489addafa0f7f3ff
mentioned in commit 9981ab48