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

Change-Id: I310f4375eea0d542d6a216efd54ba66d5b7a16a2