Merge "Revert "Add test for correct MBR ComponentName resolution""