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