am bad130ee: am 02bc5488: Merge "Remove RPC interface Type"

* commit 'bad130eed378891b82250d90aaf207088b4362e2':
  Remove RPC interface Type