Merge branch 'quic/LA.AF.1.2.1' into location.lnx.1.0-dev

merge automotive specific changes from LA.AF.1.2.1 into
location development branch

Change-Id: I90a5e60c46bb5b1aafaf4cd9aaf2dcb79449f288
CRs-Fixed: 1017254