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

Change-Id: Ia1d03896ad57fb936423c33326926ecfa85f92dc