Merge "Fix wifi channel tests" into qt-dev
am: ff1aad36ed

Change-Id: Ib14f81fe0cdf7479e6885070222920e66dacdb31