8055314: Update refactoring for new loader

Reviewed-by: mullan, ahgross, igerasim
1 file changed