Merge "Shard classloader classes lock"
am: dc148d2

* commit 'dc148d24cc11845036063a2876c9bfef03d00ce5':
  Shard classloader classes lock

Change-Id: I199b1643d34d20d64f3263178dc176ec7421e6c6