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

* commit '63b0203a07ea9f8b61834ea6dec66562b961f410':
  Update error msg when corp lookup key is not supported