Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I7ff66e1bfdf7bc85c27e3b496ee7e64b9cc0c2d3