Merge "Fix incorrect resources mapping."