Merge "Revert "Remove enableSystemApp methods."" into lmp-dev