am 1d4b6eff: am 1e4fbd8b: Merge "Using the correct time for wait_start_ms when lock contention logging is enabled" into lmp-dev

* commit '1d4b6eff25aa29cbbf4d216d65349e1ad38f962e':
  Using the correct time for wait_start_ms when lock contention logging is enabled