Merge "Reran update-api"