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

Change-Id: I098f6a06f643f68b7320f50f3e5f0a43f768e25a