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

Change-Id: I3306d389c19a42130bda31cb61bc846207b76c35