am: 467aa0fb -s ours Change-Id: Ie319920ef3118c7c6efd5fd78aa17d79d6259988
mentioned in commit b4e1564c
mentioned in commit 3a470a3d