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

* commit 'e165d40d2d03cde6f8ed8da523b65553de800906':
  Unifying method names and comments to security logging, not device logging