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

Change-Id: I807ea911b9591306dbdfdaaa370dd404ed1d7437