Merge "Fix reflected resource name in C++."