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

Change-Id: I4eb263321a8304332f6f11d0cfe009c1ef7ae17a