Merge "Move rpc handler where it belongs, related cleanup"
authorEd Warnicke <[email protected]>
Mon, 14 Dec 2015 17:36:44 +0000 (17:36 +0000)
committerGerrit Code Review <[email protected]>
Mon, 14 Dec 2015 17:36:44 +0000 (17:36 +0000)

Trivial merge