Merge "Modify Jawwal apn to sample apns" into main