Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I89366fd515d9b338c0ad9bac951d296886c313ca