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

Change-Id: I10c66bb9cedd772b945e2afda1be30b9c6c13168