[automerger skipped] Correct call swapping logic to account for connection...
[automerger skipped] Correct call swapping logic to account for connection manager. am: 708de817 am: af7cf725 -s ours am: 01013320 -s ours
am skip reason: Change-Id Id8366257edb68a6a3b153a8645b1eb062b7f6b0b with SHA-1 44dd7d3d is in history
Change-Id: I02b0f0e40edb32165f263106fc2d951d09f28be7