am: e5c12d81 -s ours Change-Id: I161fc2a9c5c87b0f794ac2b279765f200d1f9bd2
mentioned in commit 30d09f91