Use Transaction to set correct Flavor

review1076002