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

Change-Id: I136e01eed06c4bb6b9d2cc80be1ad69147db1f10