Merge location.lnx.4.0 into location.lnx.5.0

Fastforward from location.lnx.4.0

Change-Id: I08144304a318a075ba27f6b3dc5947606ffcbcef