Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
am: b2c973e6bd

Change-Id: Iffcf7f437e5e438796f01dd86e9599047292cd2f