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

Change-Id: I446750637b6e2730798fe19bc5827cb8ffa898fe