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

Change-Id: I6f0b5391b7a49232fc8bebd38047af0d77e333e1