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

Change-Id: Id204186d0f12e7a879803e4c6167f2c42de4c37b