Merge "Fix compiler filter for downgrading unused apps" into oc-mr1-dev am: 15f814e36e
am: 9f2baf1853

Change-Id: I7295e91cdcc8dbe3251b3ab93add1e26207c703c