[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." am: 0f3dbb7f am: b29e2d4a -s ours
am: 471dc121 -s ours
am skip reason: change_id Id204f3578b1c8a2a585789494915c7de0112c480 with SHA1 c7ad9ec5 is in history

Change-Id: I40967d3167f79c4814b1dcb40281a536d793f573