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

Change-Id: Ice3faac27b672416dfa09172dbf469a0f9ef0594