Merge "Cherry-pick 'Add @Nullable annotations to getOperatorAlphaLong and getOperatorAlphaShort to CellIdentity.'" am: e3ee136c89
am: 7afbfd7a9c  -s ours

Change-Id: I8307585f3b8ca64ec3c48ef84546963f965943ff