Merge "Support generic filters when EXTERNAL flag is set" into pi-dev
am: 78f939b40f

Change-Id: I8cd917b0a43ec06032c0496e714e1b213e563167