Merge "Fix RRO loading from inside APEXes."