Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I8fa805a6a096b3cd268d9d94df23798a08f0c3ed