Sync WiFi upto CM

Change-Id: I20cd3d1d8d877be0e0b0192325e22a919abc4f26