Merge "[Colgin][RDKB][WiFi][MT76] refine UCI parse code flow"