Merge "Fix Exception message in UserController#handleIncomingUser" into rvc-dev am: c62350d8 am: 2e49ac75 Change-Id: I00e4a6654caf6a18c52e0e2ab83270378bfd0c5c