Merge "Add product_available to VNDK snapshots"