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

Change-Id: Ia995732be7582e979984c2b04df081a0161236c3