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