Merge "Added EIDs for ERP, Supported & Extended Rates" into mm-wireless-dev