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

Change-Id: I14adb19177031ad9d34e64f0ffafe0eaac0b564b