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

Change-Id: I7406cd71f181cef13dc0daee2c5c16e7bbe0745f