Merge pi-platform-release to stage-aosp-master - DO NOT MERGE

Change-Id: I911ffeb6515d88891d1ce61b99c4df0812a0aaae