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

Change-Id: I267eee9feba9de1d4998fdbe67485dee89c62a58