am f3f62f26: Merge "Update instrumentation stubs on resolved classes"

* commit 'f3f62f2690445e13631049bee44bf96c9d5b1f29':
  Update instrumentation stubs on resolved classes