Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Iaa263d6db015fd48cf7ffa2c9ef0b0859ec88b4d