Integrate upstream changes from 8u121-b13

- Minor javadoc changes

Bug: 64065632
Test: m
Change-Id: Iabbcb1c3f351ddbe7aa1620a215e78a8c50d035e
2 files changed