[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: b57de562 am: a2a3815e -s ours
am: a614bc99 -s ours
Change-Id: Ifd10b422b974c07db8b363dbac431f2547433161