Merge changes from topic 'libnl-3.2.25'
am: 821e05033e

Change-Id: Ic9fbeb7ff03a1b50fd90089d29f5c3beb442f59c