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

Change-Id: I5adc6b8e664b6c3f71bd804e8ac8f3210fc1e929