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

Change-Id: I183b23353bd8a0ed97cfaec4462a88912900f203