Handle AZ aliases when scheduling to cells

Change-Id: Ia37ad7551687c3d05a35eb799df27c62a327e9f4