merge from srs. add st patch for arm.