Merge remote-tracking branch 'origin/Bitra.LA.3.2.1-target' into fp4t-target-0414

Change-Id: I064ad8fc342ce564f59819f76f1cc680ff609a21