Merge "Moved data settings to phone" am: fda37c33c3
am: 9769ce1600

Change-Id: I52c98029434fe1bad0d2bec986b7c0b0731734dc