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

Change-Id: I04bbb202a8709ab12f2564c4acd9e4fe4ec27210