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

Change-Id: I2e34c0250a62fbd417f620e72504682f7bd9f577