Merge "Addressed API review comments and updated JavaDoc" into nyc-dev
am: 80fa590

* commit '80fa590644f585a64103e3d3a6688c2e88f61592':
  Addressed API review comments and updated JavaDoc

Change-Id: I6ef6d2e7e770af2dbf257faeb8abfd1c9f79f0b9