Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ic0464dd17947c21144a1eea4ae4a9040d63261ed