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

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