Merge "Update broken javadoc code ref. Use class fully-qualified class name"