Merge "skip filtered entries instead of returning" into oc-mr1-dev am: 5ead92fd93
am: a15eb27487

Change-Id: Ic8bb63ebcd9c274559aa7954f6984d79084b3f13