Merge ethtool upstream commit 2941970e0f60fc90b0ef09f20f7fe9a72ab2dc1c am: 76667b5de3 am: 0eaf0a037b
am: c96aec662c

Change-Id: I63b14827cdd286f5097f84d1527353bdc10c75cc