Add fix for flavor creation

Change-Id: I2314097277369c6fc3499c9357c5a08baa280246
Close-Bug: bug/1260724