Merge "Rename waitForConnectivityBroadcast" am: eb6a236187 am: daf956f91e
am: 61177acef9

Change-Id: I9c3197407c99bb209700364686ee64d6ccb07a06