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

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