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

Change-Id: Ibe2cbde12d9064514653a018eba79685a3cfb552