Merge "VoLTE/E2E service flow fix"