Merge "Clarify javadoc for SecurityLog" into nyc-dev