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

Change-Id: I15ed1541caacc071fbcafad792fad1b1c5140f31