Merge "Update for ::descriptor -> const char *."