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

Change-Id: I81811e8c0e9da73d03614cad7a4e7e6340c06803