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

Change-Id: I74687df8a95bff2dfb355e215ff28b04f77ead5e