Merge "Move alpha long/short to the base CellIdentity according API Review." into pi-dev
am: c2bdecb8c8

Change-Id: Ie210a52ffb6eafa09c390bc51d39e558ee297bfc