[automerger skipped] Merge "Fix issue that after reboot we might ask to select...
[automerger skipped] Merge "Fix issue that after reboot we might ask to select default data again." into qt-dev
am: 8dee54e3 -s ours
am skip reason: change_id Id204f3578b1c8a2a585789494915c7de0112c480 with SHA1 1bc557ba is in history
Change-Id: I318e7c9fc9843af18fbd82ed509cab59547ec595