Merge "Rename the native test file" into oc-dr1-dev