Merge "Scan permissions from /product-services/etc/."