Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I2ce67552f3bec79b37301b767d914fa673b2a106