am: 1a6ae6c1 -s ours Change-Id: I058a19babc89a2015a90e022b76dd927f12bad58
mentioned in commit cbc3b88c