am: 9eaf8f48 -s ours Change-Id: I4e39afb1df962b680893fee8b1d47fc0fe3ef588
mentioned in commit ea589651
mentioned in commit 70392a85