Fixed issues from cherry-picks for 0.13.0-rc4.
2 files changed