Merge "Softens one of the battery strings per UI request" into pi-dev am: a822d42415
am: f14673736f

Change-Id: I5484b2cbbae09bd666f7484681a2a5c2733bf108