Merge "freeze rpc binder wire protocol" into udc-dev