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

Change-Id: I6c17b97c362f38d66fd7ef3d6601fb0a529b5577