Some power management tweaks from Code Aurora