Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I320ca6a833d6974c8f8ea81ed994dda1e371bd0d