fixup! Support flavor create call with cells

Change-Id: I74904ec5d7c101a4d0e70638c19411cfd1e6ecd1