Merge "Use OO Methods for CellIdentity Instead of RTTI"
am: c6a9e0e504

Change-Id: Ie3fe7b2c87f18b0c9fc2b3312d2b08dc5b0989ec