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

* commit '433348326c496760dabee1130b17e684419cca4d':
  Timing hacks DO NOT MERGE