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

Change-Id: Id9ac93481aff5a2327dc0617fab597956101a9e2