am: 8a4884e2 -s ours Change-Id: I465be453d2062c2e8c74dd8a9f1d0098ccb8e4ee
mentioned in commit f1a56b17
mentioned in commit 23bf0f3e