Merge "Return detailed reason of invalid proxy settings" am: 58700af05a

Original change: undetermined

Change-Id: I508afded5d574aa42800cd61b0eb61b14799e5f5