Merge "Add a product variable for priv-apps dependencies."