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

Change-Id: I33af1b598be3c2650a368aee41687c27851edbb0