am 9dd7d0d1: am 3fff05fc: Merge "Fix the remaining JavaDoc warnings"

* commit '9dd7d0d1f1d216d5e910247abbf080f7d2ab22b1':
  Fix the remaining JavaDoc warnings