Revert "Revert "Revert "Prima WLAN Linaro O3 fixes"""

This reverts commit e3107dd17b4211dbee190bec191ec43a54a25628.