Merge "Update java doc to add expression for return value" into main