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

Change-Id: Ia35c3ff6e3c8fd2af13604134051128747ba36e9