Improve cmremote

Change-Id: I7e1f87ed92cddcf8df3ea4fd701f56a9ef806add
(cherry picked from commit ce2cf2423569f2ea39c204e959d0b39932b477f6)