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

* commit 'e12d62bd79d27f1719ac6db01b1dd53289fe03d4':
  WebView downgrade prevention logic

Change-Id: I9d67d612696078b647eef9ac575da0e47e08eab4