Merge "Replace NOT_SUPPORTED string constants with empty strings."