[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: c5804720aa  -s ours
am: 2ed057f5d8  -s ours

Change-Id: If8a9e418c55285737202dc738aa2e1ac60f0dcdc