[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: ee34115ee2  -s ours
am: 1cecf7a319  -s ours

Change-Id: Id5177ec621952d676ccf0358a3b060ac7a02ac21