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

Change-Id: I5154dd1b550aaa0bfd538fb722423daaa5794dce