Always allow overriding the endpoint

Change-Id: Iff4d152e8e59f895a42adf6927e559ca73472888
Merge "Always allow overriding the endpoint"