am 89b91209: Merge "Track enable/disable of transport components" into lmp-dev

* commit '89b912093244837e9f400705099ac4ed22e6c764':
  Track enable/disable of transport components