Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I2999fa5f514484db030b3aac0ac9f2f5f0463cee