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

* commit 'dae3244b9b595f4cd964536b444b379f66205b99':