Pickup license changes from upstream.