Merge \\"API cleanups per API review.\\" into nyc-mr1-dev am: 138a3f3ad4
am: ba5f1622da

Change-Id: I0199d6e1a365812c8f7ba3e36390e789234da29f