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

Change-Id: I6af412ddea5c5c8fb63154436fe9253aa69ccf3b