Merge "Enabling flavor marker tests"