Merge "Logging to KEY_INTENT security failure" into nyc-dev
am: 83d036f497

* commit '83d036f49766c14258705054525f1a6f946c5e12':
  Logging to KEY_INTENT security failure