Merge "Add config to disallow the battery % option" into pi-dev
am: a063da83f1

Change-Id: I4a0fe7c68bb8de5e55e83120ad323e5059b41149