Merge "Fix WebView Metrics opt out Javadoc formatting" into nyc-dev