Merge "Handle submodules in auto-sharing"