Merge "Update java doc to set deprecated" into main