Do not scan system apps unless after OTA
am: 3366328245

Change-Id: I6e901e26f61cd4bad8ba2a1b927f34d141b0423d