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

Change-Id: Ic67607d708386d591db20fd2c4021330d9031d0c