Forward port circle battery.

Change-Id: I6f832e614523b5218e0314060b04c2fc28968553
Merge branch 'cm-11.0' into martincz