Merge "Remove cell info from legacy apps without location on" am: 6b0e7370e2 am: 1c1b58432b
am: 85f47b72b8

Change-Id: I4bb4fcb6549772ced86030d0ed8cdc3d0ef0eacc