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

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