fixing the flavor tests

Fixes Bug: 1157541

Change-Id: Ia77a71139fd96aadfe9618240c5c234ca552f167
Merge "fixing the flavor tests"