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

Change-Id: I119a29e55cf54867e5b87ad40cc3a384fc0810e8