Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Idf7c3444cbd58468ce395875173d44e985d5c35a