Fix: 220247022 Test: Only JavaDoc changes. No test needed. Change-Id: I1ea9673da0b18efb6432f37e9aacb88ffecbca37 (cherry picked from commit 311e617a)