fixup! AZ support for cells

Change-Id: I0335fc2ba086f5e6b10516c75e26016eee3bec13