Merge location.lnx.3.0 into location.lnx.7.3.9

Merged into subfolder sdm845

CRs-fixed: 2153405
Change-Id: Id10efb2acc5aae79efc375b4d7535de69408c433