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

Change-Id: Id6cabe37e1a8ff8f247af085a7b4a312f2b5d302