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

Change-Id: I641ef7f8950bdd7a6f674ad6506a84905877f41c