[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 8979b83f -s ours am: f545dd78 -s ours Change-Id: Ic11a98e1cbdb2f51e4c34d5722313005d78200d1