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

Change-Id: I7a6bfbc706f69ea19c6f0423ded56ec286d31693