[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 35df5144c0  -s ours
am: 05644ba3e4  -s ours

Change-Id: I1c8e12974bdef22daf31257f1b8bb4db7f13472a