Merge "Add support for polling transport." am: dc3a75e70e
am: 154856a890

Change-Id: I1f0a556f99840bb1d4a856126cdbf32f4fb5c0e9