Merge "setup_fs:  remove permissive_or_unconfined()"