am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE]

* commit 'c5c2ea04780ddf77c37618f7ed37d575a5cd0744':
  Add missing resolveResValue call. [DO NOT MERGE]