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

Change-Id: Iad7547fe9b516d0d06df308a8d8d3362611286e8