Update javadocs based on API council feedback.

Bug: 206743433
Bug: 193539271
Test: make
Change-Id: I24f5ebf228bf1ae28f4d7b32ddef222482114eae
2 files changed