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

Change-Id: Ief7df5312104e44bda140f68dd5e6821c2736bbf