Merge "Fix string comparision and return value in try catch block" into nyc-dev
tree: 669ccfe1bd5c314f3a7b23ca4fd62dfd53e001a5
  1. service/
  2. tests/