Merge "Address API review comments." into nyc-dev am: 9a32929def
am: a87343fbeb

* commit 'a87343fbeb2986826e56989ea93e143aaa4a7bb5':
  Address API review comments.

Change-Id: Ia94f104c94b31a7e6fa579ced3046260117337f6