Merge "Update Common Criteria mode javadoc"