Merge "Update javadocs and remove unused hidden API constant"