It should be a separate PR. `riak_core.proto` is still in the `src` directory, even though it is only used by KV.