HAL : Merge branch 'location.lnx.4.0' into location.lnx.6.0

Change-Id: I27237b9c9fa57501d86d5cbfd2f2e07bc1fe2ffb
CRs-Fixed: 2824338