Merge "Some fixes to power manager lib code"