Merge "Add one DNS metrics field to record DNS internal error" am: 4b129779 am: 405a14ae am: 73a7c564 Change-Id: If181bcf1fea4003a9ddce017974cd7f76fe642b9