Merge "Battery monitoring fixes:" am: 511d573149

Original change: undetermined

Change-Id: I80255a49b80cc2d4c890835c6250f3e45356e55c