Merge "Merge "Fix Exception message in UserController#handleIncomingUser" into rvc-dev am: c62350d8 am: b177adde" into rvc-d1-dev-plus-aosp