Merge changes from topic "am-16cd9164212e4a1fbb9677984db72e08"

* changes:
  [automerger skipped] Merge changes from topic "wifi_transport_info_stage_1" am: e126101fe6 am: 58c94eda42 am: 741b00a913 -s ours
  [automerger skipped] Convert WifiInfo to TransportInfo am: 6c5626edfc am: 78111d5950 am: ad29f8165c -s ours