fixup! Support flavor create call with cells

Change-Id: Ic390a5ec53368fd923d85d9ed4a08dcd7aa4376b
fixup! AZ support for cells

Change-Id: If23c41a65bd8821f2b097aa3df75f7658cf940e5