Merge "Reverted the ApnSetting behavior"