Merge "Add TEMPORARY_ALLOW_LIST_TYPE_NONE." into sc-dev