Do not hide annotations on light classes
Replace a hack (Internals class) with a less-of-a-hack workaround

 LockBasedLazyResolveStorageManager is put into the same package as LockBasedStorageManager
Buildserver auto merge