Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: If0d473d655f211f7633049942a49bf86e8a470c3