am 7aafd7fa: am 0b09eefa: am e69acd7a: am 104999b9: am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev

* commit '7aafd7faacf0e31dbfc4931c137d0bad8862df87':
  Pass connection configuration when setting wifi info