[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 6550cab4ef  -s ours
am: 678b022bbd  -s ours

Change-Id: Icb3bf8c0faac7a13e14694729add3b86877232ab