Attempt to fix Settings>Battery

Change-Id: I6d47bfa22f2a31505bdbae062bbcf89196c07557