Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ib48cbee8a40c1cd4d1df2ae1ffdfd9ea3e522e87