roomservice: Back port from cm10.1 branch

Conflicts:
	tools/roomservice.py