Merge "Check for NLS bind permission when rebinding services" into udc-dev