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

Change-Id: I999f40ddeff3df03679e8f8768a31de6ab8afbe0