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

Change-Id: Ifbc5829b82b321b8921b9fb8ca821805a3a3f618