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

* commit '104999b957440251610dc31939938ef0c85ab23f':
  Pass connection configuration when setting wifi info