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

* commit 'e93651f6443e2d566703189e232b53d8ae959ab2':
  Shard classloader classes lock

Change-Id: Id2b8898b2fe5aa68cc8d5021a3167b1767e1ce88