Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I2fe74ec04164487f91060560c4a52d1faf5286eb