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

Change-Id: Ic59d0a56a191ed2c3685bc897f2388dc3260c5c7