Merge "Avoid accessing proxy service if it's unavailable" am: 0a384663ed am: a292acf8f5
am: 18a8e142d8

Change-Id: Iac595fad5e3420857996492d210b624fb81b871e