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

Change-Id: I2ef7e3ff24f1e2caa55750510a467cb96fe86f51