Merge "Addressed API review comments and updated JavaDoc" into nyc-dev