[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: b366682def  -s ours am: 48f279a9e2  -s ours
am: 9079d7b217  -s ours

Change-Id: I26a7e81ea87f7fb45911e04b743ab1a22ef7820e