Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I63165893b1dc4aa9659b74cd0043e1ce36b43440