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

Change-Id: I628a0bdafac5e24a6333d281809502c2af4c8489