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

Change-Id: I53e68a9fa72d1f0635d4384fc7e9550e8a45d3c3