Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am: 50fa8ad424 am: 567cfb01b4
am: 938e80be1e

Change-Id: Ic2cc1a3c9162e6ae7b63974f4a631476af675de5