Merge "Fix Java Doc for priority group" into sc-dev