[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 05fb111e -s ours am: cdd46b59 -s ours Change-Id: I7b9e168fe0367b24f33d2dae573a8b756805ca1b
mentioned in commit 590cb521