Merge "Fix BaseInputConnectionTest" into honeycomb