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

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