Merge "Throw a RemoteException for the getUuid API" into main