Merge "Adapt to upstream changes."