Merge "add millisecond timestamp to locallog" into lmp-dev