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

Change-Id: Iae64408aaa970b193021c8877d52b78477b3a197