am 574f197e: am f913ff3f: Merge "Force set resolved method for static invokes"

* commit '574f197edc2ce627e5b3700fe1b9d645bbaf814b':
  Force set resolved method for static invokes