Merge "Add /system/product/* paths to permitted paths"