Merge "Fix failing WebViewUpdateServiceTest." into rvc-dev