Merge "resourceloader: Fold legacy modules into base modules request"