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

Change-Id: Ia63b7584e6a1311e48c8544158f2674313a26fe7