Pass positions when evaluating (cherry picked from commit c8458bd731) Change-Id: I1b4a5d58973be6264ffdb23b4492da200fdb71be
c8458bd731
I1b4a5d58973be6264ffdb23b4492da200fdb71be