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

Change-Id: Ib947e04fc2b8fd11b9fd0e177465b6eb52d9f3a0