Merge \"Improved keychord logging.\" into nyc-mr1-dev
am: a6cb3062ff

Change-Id: I3ec9c843f635e0349bad5b7db1d90dc97f88e6d8