resolve merge conflicts of d81d315 to m-wireless-dev.

Change-Id: I2ab88e2ad9e79f3e84469ccecc4e293eab5a0e55