Merge "A native method may be running and have the resolution stub." am: 8fa2ae3900
am: 098aed8d7b

* commit '098aed8d7b12756b724d83c578d307c2c24f2705':
  A native method may be running and have the resolution stub.