Merge "Changed path to the private dns headers Bug: 13219633"