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

Change-Id: I7821557819e58f55a354ceaaccb3962cbc871e41