docs: Javadoc fixes
am: 42be03df6a

Change-Id: Ide86623f0faed38adc01b364632716e8ec250582