Merge "Fix a bunch of API review bugs." into honeycomb