Merge "Fix issue with copied methods not being checked." am: 70e2d7e52a
am: b3dbcb8524

* commit 'b3dbcb852443964f55cfcde960d534dea48e23eb':
  Fix issue with copied methods not being checked.