Merge "Shard classloader classes lock" into nyc-dev
am: bdf6df1

* commit 'bdf6df1ef5ac0e2b5420a4b4d6a4c77758b0037d':
  Shard classloader classes lock

Change-Id: Ia52fea5c1c2d47ef749271406bf408279a1e8840