Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I477a71fe2ce33b006a10f4453262dc7f6bb37e21