Fixed javadoc XHTML to HTML and fixed typos (#13518)

Change-Id: I9a61031b0ba786098db51d77d8c73dc9fb36aeb9