CM Circle Battery frameworks

PS2: Fixed an incorrect symbol and attempted fix for QS Tile
PS3: Builds
PS4: Rebase for merge

Change-Id: I551887bf80da0e219fcb1d0f0ff1b0361849aad5