Merge "Sends the correct error code" into rvc-dev am: 50ec69fa09 am: 72c7d05609

Change-Id: I0bc8b55aa4ec7509786b19198d6114155ecffe90