Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Icd0f5ad75148c8842b0c279636372bc1b093ba98