Merge "Handle errors listing flavors and images in scenario utils"