New API

Change-Id: I0822407bb808382da56146ecf7e52cacb7cb8613

Conflicts:
	res/values/cm_strings.xml