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

Change-Id: Ic5235c90571dc90411570fb16e9003a89e79c183