Merge "Moved data settings to phone"
am: 9ceab92e6e

Change-Id: I7e5574fd3408aaf9a0cdaf7ce488fa60f02675ea