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

Change-Id: Ie6eb9fa7219e21c311327770a033944e74e6479b