Merge "Add explicit native method test to 988"
am: e3f0656a18

Change-Id: I97df430a09e579eb4dca618eff2f92a2efa367f4