Merge "Logging to KEY_INTENT security failure" into nyc-dev