am: aa107891 -s ours Change-Id: Ida599c569b7e88f50af6ffd267e4a67275e654fc
mentioned in commit b84800c3
mentioned in commit 76dd93f2