Merge remote-tracking branch 'origin/sm7225_r_fp4' into fp4-r-rebase

Change-Id: Ibdb3319e02f6700b61103af0c04973b11b528682