Merge "Add Conversion from CellIdentity to CellLocation" am: 713eef404e
am: fe3124bb48

Change-Id: Ia74528413a6a860e1884c377db294d27f77751be