Merge "Fix ConcurrentModificationException in mocking tests." into mainline-prod