Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I0b6a3f15386f8b6cedddf437ede2aee15fcfffb5