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

Change-Id: I29fe2b8c212d8447792b5c721fd794933ae14a96