Merge "Update error msg when corp lookup key is not supported" into nyc-dev