Merge "Fix permission issues for network update service"