Merge "Stop depending on the ConnectivityService default request."
am: e62097f71d

Change-Id: Iae908cb959d50870923bce4dbe1bfed5f4c26c2c