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

Change-Id: Ic77acbada95acb707cc40f99e0cedcac60fffeec