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

* commit '68104b0529da95644c6cb65ab7ebb0c0bf7dff57':
  add millisecond timestamp to locallog