Revert "Revert "Use try lock to fix class resolution race""
am: 23da026ec7

Change-Id: Icc27f56679886cddbacdd2fcb198bdeeafdd1904