sync to trunk head (37853) (except rbuild changes)