Improve JavaDocChange-Id: I8644442a325d330d920db78d7d60a41065837739
Fix testChange-Id: I9dd3eac1bb151046118c41049760c95b83abc73c