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

Change-Id: I85fcd7a8f0ab0e4305f0d6d71663272eb5babcd8