[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 81e663ed48  -s ours
am: 507a5d97a2  -s ours

Change-Id: I2c25976e60ad286e496567329affc41da13c27ed