Merge "Fix up WebViewTest#testLoadDataWithBaseUrl. DO NOT MERGE" into jb-mr2-dev