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

Change-Id: If3185680f7c7f92b298c649c4291cbe00054a6e3