Merge branch 'sm7225_r_fp4' into Bitra2