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

Change-Id: I0b6e2889788123f7b73de697098f44e324587477