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

Change-Id: I14e62b816782b6ca2b20d66242a1af802302e191