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

Change-Id: Id2d24e21e66652fa6b5470667e3a9f22b1a23e94