am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev

* commit 'c67e5ae2da638762aec73b3c9a1c368defc79b5e':
  add millisecond timestamp to locallog