Merge "Add explicit native method test to 988"