Merge "Added missing calls to onConnected() and onDisconnected()."