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