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

Change-Id: Ida8c4ec420c1b56299710ecf91f27d18ca0b0889