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

CRs-fixed: 2414738

Change-Id: Ic8d1cd5bb37d1ad26c2749e46be279942e28ac05