Merge "Re-enable wifi firmware debugging"