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

Change-Id: I38e1d83ea8335cbc843a5fe14470c0a8e7af12a8