Merge "Fix adding wifi configuration issue" into tm-dev