Merge "Fix for missing location icon" into pi-dev am: 8c4c359b25
am: 2b04227379

Change-Id: Ib61d6ed9db7082f5255c7b9eba61cc4616e7019e