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

* commit 'bcea352d2ce59c98414d15cb38f16d4c1abe2b72':
  Disable timestamp logging.