am f5ca45ba: Merge "Add missing resolveResValue call." into mnc-dev

* commit 'f5ca45baab32d83bd46a85917dc5521785cd2a89':
  Add missing resolveResValue call.