am b2c64b8c: am 057c3460: Merge "[DS] Location does not work with only Cellular data" into lmp-mr1-dev automerge: 50defb9

* commit 'b2c64b8cb6421a5431cdf5fd89f7c4d84ec05bcd':
  [DS] Location does not work with only Cellular data