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

* commit '0b09eefa35066e4c43300dcd5b38689c6114b1a2':
  Pass connection configuration when setting wifi info