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

Change-Id: If0301f70f5e58f0cea43f6f9266f98336bf543e5