Merge "Missing Javadoc update while API review" into lmp-mr1-dev