Framework: Forward port Battery light support and fixes

Change-Id: Ic81d3ffb7548c7b7e34ffecd2f9db781f13b705d