am f3baa36f: am 22e0ce3a: DO NOT MERGE Add locking to prevent races between setting class methods and marking

* commit 'f3baa36fe2cc9d4942e5f84f25ef737d06994501':
  DO NOT MERGE Add locking to prevent races between setting class methods and marking