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

Change-Id: Ifa9ceb8eccf8db12eaaa6f67cf3e9c64b1261628