Merge "Add hidden API to get vendor genfs version" into main