Merge "Move settings intelligence grant file to /product"