Merge branch 'CR_2506_515_usb_wifi_jianlong' into 'vf2-515-devel'