Merge "Update instrumentation stubs on resolved classes"