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

* commit '88b927e258214a31342326d46f527528e5979f85':
  add millisecond timestamp to locallog