am 0c4dcb93: (-s ours) Merge "Added required features to location mode tests." into lmp-sprout-dev

* commit '0c4dcb9357fd485fe9d5821597d645724a7c07b2':
  Added required features to location mode tests.