Merge "Refactored AbstractRemoteService in 2 classes."