Merge location.lnx.5.0 into location.lnx.6.0

CRs-fixed: 2603353
Change-Id: I20bcd438966109e1adbbaa289ee8e216527e1700