Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105
am: bfbc502b70

Change-Id: Id84bbe631bf0cd7dacec5a93096e5c3b657b0ae0