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

Change-Id: Ie742d52932ded4aa1bbdd6ca4086ca9046b44733