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

Change-Id: If52149be3bcc3f9938323daf0395914025f02e2f