Forward Port Circle Battery

Change-Id: I587548834f70874e74f3e986fcb187c2c9d3a1cd

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml