Add user name in the feedback data.

chrome/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java

Index: chrome/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java b/chrome/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
index e5820d4f7c3c0afd6818e1b6750b4366891148df..e388e65934b35451400d9fc7bb1ccec1c2c17cb5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
@@ -14,6 +14,7 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.StatisticsRecorderAndroid;
 import org.chromium.blimp_public.BlimpClientContext;
+import org.chromium.chrome.browser.ChromeVersionInfo;
 import org.chromium.chrome.browser.blimp.BlimpClientContextFactory;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.profiles.Profile;
@@ -288,7 +289,8 @@ public class FeedbackCollector
 
     private void addBlimpData() {
         if (mProfile.isOffTheRecord()) return;
-
+        // Only collects data for Blimp in local or canary build. See crbug/653721.
+        if (!ChromeVersionInfo.isCanaryBuild() && !ChromeVersionInfo.isLocalBuild()) return;
         BlimpClientContext blimpClientContext =
                 BlimpClientContextFactory.getBlimpClientContextForProfile(mProfile);
         mData.putAll(blimpClientContext.getFeedbackMap());