Merge "Revert "Revert "Use try lock to fix class resolution race"""