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

Change-Id: Idff345e052b1d39a51fbdc4caec6bbe5c204e43a