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

Change-Id: I7fa131aed75b430648b4f7de8ba5b2b9effd1f2c