Merge "Update javadoc as instructed in b/184654824." into sc-dev