Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I5b275e83b1c5c4258dff6f45fefb80571eb2ae93