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

Change-Id: If01164917867cf4adbc958287e2a5dd636130301