Merge changes from topic "am-fb9bb7ffb647476cbb117c64ecc4bcaa" into nougat-cts-dev am: 5c36e49a9a  -s ours am: e5112d7507  -s ours am: 4ff1217b44  -s ours am: 8cea10cfd7  -s ours am: 48a6876528  -s ours am: 3393dffcf5  -s ours am: ef25b2c1ff  -s ours
am: 81d1bab954  -s ours

Change-Id: I293c4f32e4a9aaf5be99fdbddfeb6be1f436e142