Merge upstream ethtool 5.2 am: 1b58ad67c3
am: 4a619f37f1

Change-Id: Id9d719c0757a89aa59ff36811520f2c35f613775