Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am: 50fa8ad4 am: 567cfb01 Change-Id: I132c3018587e4c2b5766b53c1536494ce1e39f89