Sync with ports r332467.