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

Change-Id: Ic7962a127aebe6994cd77135914a7bbfd584f81d