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

Change-Id: I13cefc67ff9f52ef0b10f4183c8ebf97670e2f25