Squash CM upstream

Change-Id: Id8ba4369fcd0addea93c8e4887538023ea603c31
Squash WLAN commits

Change-Id: I82b20b674e2326c4d5ba9f633aa7e463cbe29e6c