am 91717497: Use system properties to track the current transport

Merge commit '9171749700853305f3e6abbcdbd9e02f3a71d459'

* commit '9171749700853305f3e6abbcdbd9e02f3a71d459':
  Use system properties to track the current transport