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

Change-Id: Ia33547dfec9adf4000d3ed2665f2c3804be97071