am 80ad0b0a: Merge "Fix a bunch of API review bugs." into honeycomb

* commit '80ad0b0aeb5a55d2e62aaaf18863253501b87b60':
  Fix a bunch of API review bugs.