Use try lock to fix class resolution race
am: 1386f8619b

Change-Id: Ic196684640f2bad1b24837bdefd902305b4eb785