am 0ff9212d: am 19681af4: Merge "Handle throttling being disabled via policy change" into froyo

Merge commit '0ff9212d077e77f8b3e0afa232293306c0f72d07' into kraken

* commit '0ff9212d077e77f8b3e0afa232293306c0f72d07':
  Handle throttling being disabled via policy change