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

Change-Id: Ica4a8cca9fa4bb3a23cb1c4238e51efdf9a5f98c