Add checks for fwdlocked and updated system apps add more tests remove duplicate adds
495d820c
ccaebfc9