Merge "Do not re-try for auth failure on local-only connoction" into udc-dev