Battery lights support (2/2)
Forward ported from CM.

Change-Id: I4e4bf03fcec93824a742b760e45a1536a744a0e8