fixes for power profile
Merge branch 'cm10.1-2.6.32' into martincz