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

Change-Id: Icabfcdda910dcec04da35ad9e05bc0ffa0c28a55