Merge "Cherry pick -DATRACE_TAG=... from goog/master branch." am: 6cfabaeb66
am: 3ab6cf9d67

Change-Id: I7ac1027c00214c58571f24f17eac269bdb359043