Merge "Perform write barrier on declaring class when adding instrumentation"