Merge "Adding hidden APIs for assigning Admin flag to users." into pi-dev