Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I284f393b0058361af3f32efb884cc8d36063c026