Merge "Change the generic call failed text" into nyc-dev