am: 583a1c17 -s ours Change-Id: I0328501e34ad54b5458c0ea3d53672ea47d18717
mentioned in commit 115b9d5f