Merge upstream ethtool 5.3 am: e3e8310f4b am: bf94105ff0
am: db83832c43

Change-Id: I23e9e0ea45c0c5bd879976345e043c8ddf4c6ed6