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

Change-Id: I59fdb056c43c36a8a52753f9293603576d56c343