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

Change-Id: Ie9a31767920b5446ce2c87a683ff178e188a939e