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

Change-Id: I274ebbb9c378e7522754751566ef541624885198