Merge "Fix an issue with apps EXEMPTED after OTA"