Merge "Address API review comments." into nyc-dev am: 9a32929def am: 1ffef9a239
am: 2386212c05

* commit '2386212c057009014b16c378910e0aea5292a09f':
  Address API review comments.

Change-Id: Iba1c5f79cdb527b710026e1e5ae9f3e337ff754b