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

Change-Id: I889a67126690026c4b8d369db75433b147dacb91