Merge "Update javadoc and log message to avoid confusion." into tm-dev