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
Change-Id: Idfef92d1a6893da2cff4c50a302b0a5e9640f353