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

Change-Id: I737c17c5f907322c9fa60453b30673b85fcbb3a0