am 4b41400b: am e2f4ab93: Merge "Default "pickup peforms proximity check" to...
am 4b41400b: am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev
* commit '4b41400b':
Default "pickup peforms proximity check" to false.