Merge "Don't re-wrap index queries in QueryRewriter.rewrite"