Merge changes from topic "am-fb9bb7ffb647476cbb117c64ecc4bcaa" into nougat-cts-dev
am: 5c36e49a9a  -s ours

Change-Id: Ib1b1db78fa739f59137c85e19cf10d7f8ed1d2ab