Cherry pick r224354