Merge "Update v1awifi and v2awifi"