Merge "Enable private flavors tests"