[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 3e4f7d8dd3  -s ours
am: 62f2486438  -s ours

Change-Id: If47ecb93cd673ffe64015c13c4b0124a04acdc71