Merge "Stop depending on the ConnectivityService default request." am: e62097f71d am: 15f89ada84
am: 2dfe01def9

Change-Id: Ia3730d55442da165b779242a35c7c66bd0d9b8fe