am 0b404514: (-s ours) am f8545bc6: Merge "Timing Hacks DO NOT MERGE" into lmp-dev

* commit '0b404514d9a254c138a31d9e5bcb62dd4c760a79':
  Timing Hacks DO NOT MERGE