Merge "Don't auto connect reverse tethering after pairing." into honeycomb