Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I7f0beca5cb53790536f0811a2d76f4eaed33fbbd