Merge "Update battery strings to respect user 24 hour setting" into pi-dev
am: 919f606df9

Change-Id: Ic2cbc74ea21a4598ea2a4acff7f0ba6399dee408