Merge "Fix timing issue for testCarrierDataEnable and testUserDataEnable"