Merge "Shard classloader classes lock" am: dc148d2
am: de389d2

* commit 'de389d22810bf367f40f388eb669fe29cada0718':
  Shard classloader classes lock

Change-Id: I4ebd89a739197a4b838e671a320018544e70fed0