Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I925f50a316cc06357458828ae0b504d0b343fcda