Merge "Unifying method names and comments to security logging, not device logging" into nyc-dev