[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: f88d30990c  -s ours

Change-Id: I2ff58af38000f97d4b5e1675bd1b1c10a7f35a01