Merge "Update java doc" into sc-dev