DO NOT MERGE Fix migration for default browser.
am: 97c75f4429

Change-Id: I9465a1bd984df2644c65242e1ba465e0a1c2ae37