Merge "Only admin users may change private DNS settings" into tm-qpr-dev