Merge "Improve use of RemoteClient in device tagging test"