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

Change-Id: I3689c15cf64952c44a9b2c62602eb0f611014a2d