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

Change-Id: I17393da88a5463ddb54b5d7ecf400f08f999ad12