am f8545bc6: Merge "Timing Hacks DO NOT MERGE" into lmp-dev

* commit 'f8545bc6f498e0b93f7ee42e51ea0ff05e695731':
  Timing Hacks DO NOT MERGE