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

Change-Id: I4f25849a7bcd8d0b73d2fd9071f53afe9ae19b46