Merge "Cleanup: remove DSS RemoteException references" into rvc-dev