[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: f880549235  -s ours am: a32302773a  -s ours
am: 11e370d608  -s ours

Change-Id: I9c1edd823959a6ed0ce885b0664686b0653c983f