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

Change-Id: I10ce840ec4fb2aea62730cbcff189ecdea3e9ee9