Address dependency conflicts from upstream.

Related to: https://www.pivotaltracker.com/story/show/81068400