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