am: 8a7b6988 -s ours Change-Id: Ie103907722cfaf4e806707b7cb796a3a551d65c7
mentioned in commit d198d972
mentioned in commit acde8637