Merge "WebView downgrade prevention logic" into nyc-dev am: e12d62b
am: fd0f670

* commit 'fd0f6709124b785bd96603f237532e9ad55616e9':
  WebView downgrade prevention logic

Change-Id: If961bf429a6b68772aba1818ccbd6c18c8c9c1ce