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

Change-Id: I89e2aa427fd926041d4689e8cb85da2459372fec