Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I8cbc9961a97d5f3a4690b24ad0e994b7ec4a5dff