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

Change-Id: I75fbeec6c253955684c56c5463847590ae43f73a