am df0698e9: am 6d6d4976: Merge "Change location settings icons from crosshair...
am df0698e9: am 6d6d4976: Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev
* commit 'df0698e9':
Change location settings icons from crosshair to pin -b/8142654