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

Change-Id: I5c0a0245276a746b1fbdaa1bb63c4af9ecaf0af8