Merge "Moved data settings to phone" am: bcd6a7db39
am: 67475a5c66

Change-Id: I5ae8d51ffbdfa41c0cfacd49a2d10524f6abdd25