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

Change-Id: I16a77e0369be3d173f3fe63ed2ed2633589ca196