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

Change-Id: Ibf2282c0d1b842a2b64ddcd155345a87cf47a242