Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I0f1ecc71d69a569e9b9f72df2b65c03ffe908568