Merge "Update cross-profile javadoc"