[automerger skipped] Merge "Move alpha long/short to the base CellIdentity...
[automerger skipped] Merge "Move alpha long/short to the base CellIdentity according API Review." am: ba9e6071 am: 24978ec6 -s ours
am: 1b65d041 -s ours
Change-Id: Iceb47b532165bd4c4acd8b35ce2ead985e8ef624