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

Change-Id: Ie7e1c8de0bdc6b28d19ed92570216ce2d18488c3