Merge "Fix bug 4551701 - com.android.browser: java.lang.IllegalStateException"