Merge "Shard classloader classes lock" into nyc-dev