Forward Port Circle Battery

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