Merge "Simplified the initial attach APN logic" into sc-dev