[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: d602c873ba  -s ours

Change-Id: I7e6cfaf8592fdf3a1179b7b93a0d57f44cdc8a26