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

Change-Id: Icf9f84394244660520daa7d96a93c132588a0f37