Merge "Bug 1637: Change Rpc actor calls to async"