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

Change-Id: Ibab6ff93e57688c8cd87e2ed16ec3891bcd94825