Correctly populate flavor ID in flavor_ref

Change-Id: I5345704f63be2d3e8b8b85f72f615778db89f300
Merge "Correctly populate flavor ID in flavor_ref"