Merge "Cell location information in registration info"
am: 51ec76ab14

Change-Id: Ie0492e6600b89cf6b4067e3544e7f06f64e236fc