Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I5f9ab8ee55ac8d5a8542b2f5a3b170afc5f36984