back port 42210 to this branch

BUG=None
TEST=None

Change-Id: I8c23d9d6cb5400263229bed8d7a8b0e702045024
Reviewed-on: https://gerrit.chromium.org/gerrit/43326
Reviewed-by: Luis Lozano <llozano@chromium.org>
Commit-Queue: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
diff --git a/chromeos-base/chromeos-chrome/chromeos-chrome-25.0.1364.33.ebuild b/chromeos-base/chromeos-chrome/chromeos-chrome-25.0.1364.33.ebuild
index 74a561e..569880f 100644
--- a/chromeos-base/chromeos-chrome/chromeos-chrome-25.0.1364.33.ebuild
+++ b/chromeos-base/chromeos-chrome/chromeos-chrome-25.0.1364.33.ebuild
@@ -399,6 +399,10 @@
 	if [[ -d ${SSH_CONFIG_DIR} ]]; then
 		cp -rfp ${SSH_CONFIG_DIR} ${HOME} || die
 	fi
+        NET_CONFIG=/home/${WHOAMI}/.netrc
+        if [[ -f ${NET_CONFIG} ]]; then
+                cp -fp ${NET_CONFIG} ${HOME} || die
+        fi
 
 	decide_chrome_origin
 
diff --git a/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild b/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
index 8dc3643..992b564 100644
--- a/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
+++ b/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
@@ -399,6 +399,10 @@
 	if [[ -d ${SSH_CONFIG_DIR} ]]; then
 		cp -rfp ${SSH_CONFIG_DIR} ${HOME} || die
 	fi
+        NET_CONFIG=/home/${WHOAMI}/.netrc
+        if [[ -f ${NET_CONFIG} ]]; then
+                cp -fp ${NET_CONFIG} ${HOME} || die
+        fi
 
 	decide_chrome_origin