Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: 6198a40f55 am: 3b5e3ff8c9 am: 2cff554d0b am: 789c2a3a31
am: d886444bb1

Change-Id: I4f10a90da592bf928b00cb95f5b9d6c7c5abe40c