Merge "Switch to throw e.rethrowFromSystemServer()." into rvc-dev