Merge "Merge "Deliver internal server errors to the client" into rvc-dev am:...
Merge "Merge "Deliver internal server errors to the client" into rvc-dev am: f7d789b0 am: 20ec4178" into rvc-d1-dev-plus-aosp am: cc949e0e am: f7d58a56
Change-Id: I2242159c2198b3c46dbad4f98d0f6a5d1d8acf9e