Merge "Include assistant in RemoteTargetGluer" into udc-dev