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

Change-Id: Ie8aa108f8124ce98e7c6333260d453f659089491