Merge "Fix breakages in update-api."