Merge "Fix Exception message in UserController#handleIncomingUser" into rvc-dev am: c62350d8 am: b177adde Change-Id: I2f0261015e4de99cbb15280a1365819b952f0007