Merge "Don't use scoped_ptr, use std::move for proto"