[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
Change-Id: Ief6c3e1581f1a8b462db46eeeb959d7f0e70f9ca