Merge \"Revert \"Use try lock to fix class resolution race\"\"
am: 7707777f06

Change-Id: I1cd0bea29e785d45fd9b140fc2209826ff316c54