[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: bb80caa161  -s ours
am: 9a7fbbc7f9  -s ours

Change-Id: I47d88f47bd88497ed4e42bfb29f6ac621eb0df23