am: a0c00d58 -s ours Change-Id: I6a12f8ac2dded936997d51e0e57fcba8832cda6f
mentioned in commit b83c1c74
mentioned in commit 486994b2