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

Change-Id: I4b88cdf27afb4321799b15d392b8547023dece56