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

Change-Id: Idcde5d2977822b58383855325139a8f9257d7466