Merge commit '19681af44b7c7494ae8de28dab8aacc3e9d92390' into froyo-plus-aosp * commit '19681af44b7c7494ae8de28dab8aacc3e9d92390': Handle throttling being disabled via policy change
Merge commit '19681af44b7c7494ae8de28dab8aacc3e9d92390' into froyo-plus-aosp * commit '19681af44b7c7494ae8de28dab8aacc3e9d92390': Handle throttling being disabled via policy change