am: 6d0479f5 -s ours Change-Id: I35385db4c627ffc1d282a87ba37646821cfbd862
mentioned in commit 0f82b371