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

Change-Id: I65d005aa303102b212c93b0b2702941bf554526d