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

Change-Id: I4aa89e9856382fd8454bd18f2d8730ab474fbac7