Merge "Fix RT only build"