Merge \"Fix some exception messages and enhance unit tets\" into nyc-mr1-dev
am: 5b8f5fd38b

Change-Id: If0c711f8f9cef00b4a8fb279b5c5996f2995d1f0