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

Change-Id: I7a74961b0b3a76a12048f70b835221bca6dce8b6