Merge "Merge changes from topic "am-fb9bb7ffb647476cbb117c64ecc4bcaa" into nougat-cts-dev am: 5c36e49a9a  -s ours" into nougat-mr1-cts-dev am: d2ad2fb204  -s ours am: 91a445f257  -s ours am: 5495b59772  -s ours am: 8580cb8068  -s ours am: a804ecc40a  -s ours am: 2088a643b0  -s ours am: 913b378b37  -s ours
am: 1f0d6682cf  -s ours

Change-Id: Ib91f762baca612ea7910e30220e71204002a8793