intellidemand: minor clean up and tailor for MSM8660 devices