Merge "Move a set of app privapp grants to /product"