Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I6021d5abc5206ebf19ae37ef7ba7c62b1d934e1f