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

Change-Id: I58892023fb0108351840f6693739f5e5834a7ed9