am 634f34af: am a819a078: am 89ab6757: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type" am: f021438b03

Original change: undetermined

Change-Id: Ibfd6457496f6bc855a7688f8a2038e25aee78cca