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

Change-Id: I42a950ac5c501988955aa7912a875b8fd1089bc1