Merge remote-tracking branch 'quic/location.lnx.4.0' into HEAD

Change-Id: I26bfb7e728aa24ea4372d78c3b931dc82cb90f45
CRs-Fixed: 2847145