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

Change-Id: I803dfe51fa52e6a1c30b8ce472755e71fd009b60