Merge "Allow config to disable battery percent setting" into pi-dev am: 1f6c7910fb
am: 77e399335e

Change-Id: I58fa0d9772c01798ada18416bebc7fdd78bd245f