Merge \"Use try lock to fix class resolution race\"
am: 85c4a4b8c9

Change-Id: Ie267436199e2bd504b8635f62f368bd84bda1897