Merge "DO NOT MERGE Fix migration for default browser." into qt-r1-dev am: 85773ee58c
am: 331cf84655

Change-Id: Iaeeaf2f3896ccb6b1fde0cf3a19450708b550ab3