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

Change-Id: I9c53fbe64432951046d25295f69c7645fe2c1375