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

Change-Id: I07a877737f9d78fb6e661a0d73b2b6597e7b944a