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

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