Improve cmremote

Change-Id: I7e1f87ed92cddcf8df3ea4fd701f56a9ef806add