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

* commit 'b5829cdf118c5f82d9ed1ce469cbda95ff8e5207':
  WebView downgrade prevention logic

Change-Id: I51bda60f42dd6f6210e846e6dfe88e17fc0a4c05