Merge "Native API Council asked that we remove the C++ class from the public header." into rvc-dev