am d38cc182: Merge "Disable timestamp logging." into klp-dev

* commit 'd38cc182dbfce4a1d7e8e9c16bff10b71128cc01':
  Disable timestamp logging.