Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I69ec40d284274ac36b52c0ccbc3e203207c5f8aa