support filter as OR of ANDs similar to where clause

Change-Id: I5420f70ffc6dc0faff59b04af02ff436e8f3e6de
Merge "support filter as OR of ANDs similar to where clause"