Merge "Refactored DataProfile and ApnSetting"