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

Change-Id: I75a140eb10bee5057c28d96233a6a4ba0881d8cd