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

Change-Id: Icc3609ce4386079a84175b5dbdf1cbbb327d2a22