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

Change-Id: If995747e28f59153a05250cc34a9e95c0452a4f9