Merge "Added Wifi Assistant Card" into lmp-dev