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

* commit 'e69acd7a456fb97d7c816629dedb42026eabdd2e':
  Pass connection configuration when setting wifi info