Merge "Add support for Virtual A/B"