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

Change-Id: Id593da87e14f5b3725e7d24b65b1a2078be5c611