Merge "[automerger skipped] Fix the issue provider can be wrong when...

Merge "[automerger skipped] Fix the issue provider can be wrong when requesting slice permission am: 4cab9c38 -s ours am: f994f0c0 -s ours am: 4843e3fd -s ours am: 52dec242 -s ours" into mainline-prod