Bug: 184654824 Test: Javadoc Change-Id: I6817f683f8945f26f8539645c8c92302f82e7348 (cherry picked from commit ee5a06f4)