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

Change-Id: I4de78fe137ed23012f13447d9460bfe19916df33