Merge "Using the correct time for wait_start_ms when lock contention logging is enabled" into lmp-dev