[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 2f4a5d7c42  -s ours am: 7a2b55c047  -s ours
am: 79afc2c60a  -s ours

Change-Id: Ic738180fc81069698d37c38d2b5a5268ad5aaa5c