fix merge of cherry-pick.