Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am: 50fa8ad4 am: 95f418cc Change-Id: I5baa412f0a080626ccdd0d087809f8d30ef511ab