am: 8e9769cf -s ours Change-Id: I17cfc668929571594a4cf969b163fddee4ea83ae
mentioned in commit 0bd1c0f4
mentioned in commit f02a1953