Merge "fix a long-standing 'typo' bug" into honeycomb