Merge "Follow the spec recommendation for keyboard pairing." into honeycomb