Merge "Added Cell identity for TD-SCDMA and a base class CellIdentity"