Improvements for RPC interface usage hint fix (#12598).

Change-Id: Id2f3ffaaa3e242bdddec04e2379a224f08854a24