Add wificond to generic images am: 9c98383ed8
am: 514c45e326

Change-Id: I5db4a7283b716a67c20efcfe23512ac0151eb62e