Merge "VTS - avoid same MAC for AP and STA"