Remove filler / fix RpcClient$CallTimeoutException

Change-Id: I0b1aba0e71c469b8901c49714bf34e78aebb925e
Merge "Remove filler / fix RpcClient$CallTimeoutException"