Merge "[automerger skipped] Merge "Check for NLS bind permission when rebinding services" into sc-dev am: 73a43831b1 am: d806b6ec65 am: 6b6f85830a -s ours am: 4c519493f6 -s ours am: 7b4f7a2250 -s ours am: e25a1fa4b1 -s ours am: 5b3f8e7f1d -s ours am: b1b9b90a2e -s ours" into main