Merge "fs_config: add product and product_services to the scanning."