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

Change-Id: I591c043fe659d03d7b19d3ad39524a31a61b37e7