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

Change-Id: Ifbcd7ba33988c971aad56d787c845edaa711bfb0