Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I2d531e0cc27fc109d84790cbfd4747565e137ef7