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

Change-Id: I9c2ff1f437f17e070c17b9e8fc13c6833f1495cf