Merge from vendor branch ATHEROS: