[automerger skipped] Merge changes from topic "NIAP for AOSP" am: 42278a2b...
[automerger skipped] Merge changes from topic "NIAP for AOSP" am: 42278a2b am: 1b8f3821 -s ours am: a7c9dd3e -s ours
am skip reason: Change-Id I151dfe931aa80a0c9563d059b218ddfe37f653b2 with SHA-1 cf9e5b52 is in history
Change-Id: Iacaa5c164833744653e1421b5a03e53449296a0c