Merge "Battery monitoring fixes:"