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

* commit '10db90fc7f43c06014b236fe1950ba466a58d8ca':
  Logging to KEY_INTENT security failure