GitLab

Summary:
fixes two sporadic issues from missing attributes:

- breaking circular imports
- submodule not being imported explicitly

Reviewed By: ehhuang

Differential Revision: D37071652

fbshipit-source-id: 0680f098384b0fd21076339750e9d1a96186ede3
Co-authored-by: Edward Wang (EcoF) <hack@fb.com>