Minor refactoring of AndroidForwarderRPC