CA: Cleanup

Change-Id: Ied17e89dadc493bdef614104f615952cb140ff92

Conflicts:
	AndroidManifest.xml