am d73625d5: Merge "Revert "Timing hacks DO NOT MERGE"" into lmp-dev

* commit 'd73625d5e0d1fd70966264cbc518c9177d4af848':
  Revert "Timing hacks DO NOT MERGE"