Merge remote-tracking branch 'origin/QCM6490.LA.3.0' into fp5-0325

Change-Id: Ibb5d36adec58b59332b353d81190d43036797eb6