Merge "Revert change to WebViewTest#testSetInitialScale" into ics-mr1