Merge "[DS] Location does not work with only Cellular data" into lmp-mr1-dev