Merge upstream ethtool 5.3 am: e3e8310f4b
am: bf94105ff0

Change-Id: I5e032fd411185dcea99f670a0ca5a376ac34b64c