am bb1a77bb: am 000bffab: Merge "New icons that eliminate location "crosshair"...
am bb1a77bb: am 000bffab: Merge "New icons that eliminate location "crosshair" -b/8142654" into klp-dev
* commit 'bb1a77bb':
New icons that eliminate location "crosshair" -b/8142654