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

Change-Id: Iff33072d5c71c4169ab2dc3591e317a03b6e7126