Merge "Remove vr_wm service" into oc-dev