Merge "update isolated_app service_manager rules"