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

* commit 'a87343fbeb2986826e56989ea93e143aaa4a7bb5':

Change-Id: I5c761089d1456e3184b788d20527a5db509f6034