[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 77b4f77bf9  -s ours
am: 5761d9a365  -s ours

Change-Id: If5eb35a4406e2dfab1df6f12e24c2ce7e24725df