Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev