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

* commit '542cc240b5bd68a728067f65cd8bc4d8f6473b83':
  add millisecond timestamp to locallog