Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev