Merge "Perist Throttle data across reboots" into froyo