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

* commit '2d6dae2f4d2ce98adcb6fe83bcaa91a506805859':
  Fix a bunch of API review bugs.