Merge "Cleanup the evaluateBinding() method." am: c26aa87a2b am: b12af1b18a am: 3ba918c9d3
am: 7a93f7e661  -s ours

Change-Id: Id9f9eb8407047e4613540da349753a1a6595dca9