Merge "Add missing resolveResValue call." into mnc-dev