am: 05835ac0 -s ours Change-Id: I2b2e62324886dcf500e53383db8c6e82412ee3bc
mentioned in commit 12a8527a