Merge "Update SecurityLog javadoc" into sc-dev