Coordinated Change for Align VarCounter in query rewritting Change-Id: I20701e5119a65e06d33e379bc3520dff1e2d6c2e