Merge "Cleanup the evaluateBinding() method." am: c26aa87a2b am: b12af1b18a
am: 3ba918c9d3

Change-Id: I72485ebbaed2b60b48d1b4694b0db56b9f2178ca