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

Change-Id: I535e6ec4e1ceed5e57d32353caaac7126752c7dc