Merge "Cherry pick -DATRACE_TAG=... from goog/master branch."