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

Change-Id: I9d6e2480a8b94afffe7a4532036edad178c7660c