Merge "Remove unused MockableSystemProperties from DnsManager constructor"