am 1b5a9c5d: am 251ccef0: Merge "Add a Throttle check shortly after boot." into froyo

Merge commit '1b5a9c5d2fdf353d12ef1ca11dafc78f4c6f6c81' into kraken

* commit '1b5a9c5d2fdf353d12ef1ca11dafc78f4c6f6c81':
  Add a Throttle check shortly after boot.