Merge "Rename waitForConnectivityBroadcast" am: eb6a236187
am: daf956f91e

Change-Id: If7012f1f602a7290283d38dd61f309dc303a1c1b