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

Change-Id: Ic73e635af7256bda0ff71640c5ab2d9f66f882e4