Improve javadoc

Change-Id: I9a957c162e72676b5ab863fcae40a3e3b412220a
Fix: 76202444
Fix: 79737644
Test: make ds-docs
2 files changed