am 49a4212a: (-s ours) am 72ecb4ca: Make location enabled check configurable when returning scan results.

* commit '49a4212a1592cf3f75545939ec6272154e603944':