Merge changes from topic 'am-acab8711cae74de9969aacda7363466a' into nougat-cts-dev
am: 3523f7d4f2

Change-Id: Ieefa0c778b10408cbf0b69f1c1de2f1a62369147