Merge \"Revert \"Revert \"Use try lock to fix class resolution race\"\"\"
am: 0af088d126

Change-Id: If34912dd115472f4fb2a84dd82a0b1d91c488a06