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

* commit 'ed6d67c018b508b0daa1a8af80c8037f2f32367e':
  Shard classloader classes lock

Change-Id: I4ac2189cbb2802145d2cb34cb349ea4f19cc4943