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

Change-Id: I7bda26955f6725f2054e621c6fdb958be80087c4