Merge "Fix WebViewTest#testGetWebViewClient and WebViewTest#testGetWebChromeClient" into oc-dev