Merge "Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev am: c922c482 am: e7534f48"