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

Change-Id: I870ae4808da18d6581ef04beb10326db01d7a855