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

Change-Id: I1f0f75db8d16d5cf3bdfee78ab33c8aa41358281