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

Change-Id: Ia22476e0bf18c106206ca70100310dabcf294e45