Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I8b6c5179a7d338279441460b2a1f83ddd48659be