Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I75feaeb16dd8d7a1c8ba2dfe063e4c58b590b054