Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I45239f99990353b548c73bb0a59401e689598d9b