Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I929fa5df047ce9cab9ab338a66c3ea42536f0b87