Fix indentation in new RpcListener code.

Change-Id: I6eaa2f7b82ebe129e5cc05ab770fc6b90144482d
Merge topic 'rpc-clobber' into master

aa36b95a Fix indentation in new RpcListener code.