Merge "Fix issue #3387676 com.android.browser: java.lang.NullPointerException..."