Merge "Fixed test for non-public flavor"