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

Change-Id: Idc8516cab9271cb2349ddf61a1e45b3866f52f1a