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

Change-Id: Iaac51cf5114ed6af55246b3580b9f5403a1bb3bd