Merge "Remove enableSystemApp() and enableSystemAppWithInten()."