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

* commit '1ef20d6221b7d752e636653df7798f6f4fb5ff06':
  Remove RPC interface Type