Only rewrite IndexPredicates for fields in the current schema

Change-Id: I6fc584fdc59c31b21b495c6c66f6ac0a98b32301
3 files changed