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

Change-Id: If3442ebbf16064447cc881e672703a13d9a6e7d5