Merge "Battery monitoring fixes:" am: a2fabf4d1d

Original change: undetermined

Change-Id: I6b0c3888c9110fa1913d5eafef3c7033dfc73034