Merge "Moved data settings to phone"
am: fda37c33c3

Change-Id: I4855e0d6b5a4a02cdf33d9ff1d3a3dcebfb37efb