Merge "[Settings] Fix Java Doc"