Merge "Add file contexts for Auxiliary module."